merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 11 Nov 2011 07:08:47 +0000 (16:08 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 11 Nov 2011 07:08:47 +0000 (16:08 +0900)
commit96cd89bece4a3fb242858345c605527758d3af21
treefa6b4dd686dca8c943716d894d2054864690337f
parent800d4e08391a736db194cfa372d2fa082a9748ec
parent5538a505b8a62b1b021d924dfaf98ccbeec87a9a
merge trunk
src/ChangeLog
src/xdisp.c